

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

<html>
<head>
<script type="text/javascript" src="helpman_topicinit.js"></script>

<title>Resolve Conflicts [Enterprise Architect User Guide]</title>

<meta name="keywords" content="Enterprise Architect, Sparx Systems, UML, Resolve Change Conflicts,Resolve Change Conflicts Between Replicas,Change Conflicts,Change Conflicts Resolve">
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="Content-Style-Type" content="text/css" />

<link type="text/css" href="default.css" rel="stylesheet" />
<style type="text/css">
  A, A:Visited
  {
    color: #00F;
  }

  A:Active, A:Hover
  {
    color: #F00;
  }

  OL
  {
    margin: 5px 0 5px 48px;
  }

  UL
  {
    margin-bottom: 3px;
    margin-top: 0;
  }

  #nsr
  {
    background-color: #D4DFFF;
  }

  #nsr A
  {
    text-decoration: none;
  }

  #mainbody
  {
    padding: 8px;
  }

  .p_BodyText
  {
    padding: 5px 0;
  }
</style>



<style type="text/css" media="screen">
  BODY
  {
    background-color: #FFFFFF;
  }

  #nsr
  {
    padding: 6px 6px 0 6px;
    border-bottom: none;
    vertical-align: top;
    z-index: 2;
    visibility: visible;
    left: 0;
    top: 0;
    position: absolute;
  }

  #mainbody
  {
    left: 0;
    top: 0;
    margin: 0;
    position: absolute;
    padding: 10px;
    overflow: auto;
    height: 100%;
    z-index: 1;
    background-repeat: no-repeat;
    background-position: bottom right;
    background-attachment: fixed;
  }
</style>

<style type="text/css" media="print">
  #nsr
  {
    visibility: none;
  }

  #mainbody
  {
    overflow: visible;
  }
</style>
<script type="text/javascript" language="JavaScript" src="nonscroll.js"></script>

</head>
<body scroll="no">

<div id="page">



        <div id="content">
          <div id="content-inner">
          



  
          <div id="nsr">
            <table border="0" cellspacing="0" cellpadding="4" width="100%">
              <tr valign="top">
                <td align="left">
  


                  <p class="p_Heading1"><span class="f_Heading1">Resolve Conflicts</span></p>



  
                </td>
                <td align="right">
                  <a href="introduction.htm" onmouseover="document.images.main.src='button_main_h.gif'" onmouseout="document.images.main.src='button_main.gif'">
                    <img name="main" src="button_main.gif" border=0 alt="Return to Introduction">
                  </a>&nbsp;
    
                  <a href="upgradereplica.htm" onmouseover="document.images.prev.src='button_prev_h.gif'" onmouseout="document.images.prev.src='button_prev.gif'">
                    <img name=prev src="button_prev.gif" border=0 alt="Previous page" />
                  </a>&nbsp;
    
    
    
                  <a href="importexport.htm" onmouseover="document.images.next.src='button_next_h.gif'" onmouseout="document.images.next.src='button_next.gif'">
                    <img name=next src="button_next.gif" border=0 alt="Next page" />
                  </a>
    
    
                </td>
              </tr>
            </table>
          </div>
          <div id="mainbody">
  


                <p class="p_BodyText"><span class="f_BodyText">When two or more people have changed the same element between synchronization points, Enterprise Architect has trouble resolving which change to accept and which to discard. The choice is made based on some rules within the JET replication manager, but the discarded changes are also stored so you can manually override that choice.</span></p>
<p class="p_BodyText"><span class="f_BodyText">After synchronizing replicas, open the </span><span class="f_UIControl">Resolve Conflicts</span><span class="f_BodyText"> dialog and determine if there were any conflicts. Select whether to accept each change or use one of the discarded changes instead.</span></p>
<p class="p_TextIndentedL2"><img src="resolveconflict.png" width="632" height="367" border="0" alt="ResolveConflict"></p>
<p class="p_SubHeadingL1"><span class="f_SubHeadingL1">Recommendations for Resolving Conflicts</span></p>
<p class="p_BodyText"><span class="f_BodyText">Enterprise Architect stores model information in database records. When two records have been modified in different ways by different users, they appear in this dialog.</span></p>
<p class="p_BodyText"><span class="f_BodyText">Normally it is not necessary or desirable to examine conflicts, since they represent relatively inconsequential pieces of information that can very easily be modified through the normal Enterprise Architect interface; for example, by moving a diagram element.</span></p>
<p class="p_BodyText"><span class="f_BodyText">The only case in which this dialog should be used is where a substantial piece of information has been overridden by another user, and you want to retrieve it. Follow the steps below:</span></p>
<ol style="text-indent: 0px; margin-left: 48px; list-style-position: outside;">
<li value=1><span class="f_NumberedList">In the </span><span class="f_UIControl">Table with Conflicts</span><span class="f_NumberedList"> list, click on the entry that is likely to contain the lost information.</span></li>
<li value=2><span class="f_NumberedList">Click on each entry in the </span><span class="f_UIControl">Conflicting Records</span><span class="f_NumberedList"> list.</span></li>
<li value=3><span class="f_NumberedList">When the lost information appears in the </span><span class="f_UIControl">Conflict Details</span><span class="f_NumberedList"> list, click on the </span><span class="f_MenuKeyField">Overwrite with Conflict</span><span class="f_NumberedList"> button.</span></li>
</ol>




            </div>
          </div>
        </div>



</div>


</body>
</html>
